diff --git a/client/CCreatureWindow.cpp b/client/CCreatureWindow.cpp
index 9c4ef046b..ac73d49fc 100644
--- a/client/CCreatureWindow.cpp
+++ b/client/CCreatureWindow.cpp
@@ -286,7 +286,7 @@ void CCreatureWindow::recreateSkillList(int Pos)
 	}
 	for (n = Pos << 1; n < numSkills; ++n)
 	{
-		int offsetx = 257*j;
+		int offsetx = 257*j - (bonusRows == 4 ? 1 : 0);
 		int offsety = 60*i + (bonusRows > 1 ? 1 : 0); //lack of precision :/
 
 		bonusItems[n]->moveTo (Point(pos.x + offsetx + 10, pos.y + offsety + 230), true);
diff --git a/config/cr_abils.txt b/config/cr_abils.txt
index adafe866b..7da950674 100644
--- a/config/cr_abils.txt
+++ b/config/cr_abils.txt
@@ -179,6 +179,9 @@
 + 133 DRAGON_NATURE 0 0 0			//crystal dragon is a dragon			
 + 134 DRAGON_NATURE 0 0 0			//faerie dragon is a dragon			
 + 135 DRAGON_NATURE 0 0 0			//rust dragon is a dragon			
++ 136 NO_OBSTACLES_PENALTY 0 0 0			//Enchanter			
++ 137 NO_DISTANCE_PENALTY 0 0 0			//Sharpshooter			
++ 137 NO_OBSTACLES_PENALTY 0 0 0						
 + 140 DOUBLE_WIDE 0 0 0 			//boar should be treated as double-wide			
 + 142 DOUBLE_WIDE 0 0 0 			//nomads should be treated as double-wide			
 + 144 FULL_HP_REGENERATION 0 0 0 			//troll