diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce64bb0..fc4b2d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ### Changelog
 
+**1.1.8**
+* Tweak Casting Table UI
+
 **1.1.7**
 * Improve JavaDoc
 * Update Mappings
diff --git a/gradle.properties b/gradle.properties
index 627a6b2..aff339e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,7 +10,7 @@ org.gradle.jvmargs = -Xmx1G
 	loader_version = 0.7.8+build.187
 
 # Mod Properties
-	mod_version = 1.1.7
+	mod_version = 1.1.8
 	maven_group = com.thebrokenrail
 	archives_base_name = sorcerycraft
 
diff --git a/src/main/java/com/thebrokenrail/sorcerycraft/client/block/CastingTableScreen.java b/src/main/java/com/thebrokenrail/sorcerycraft/client/block/CastingTableScreen.java
index c5ed0a7..186ad3a 100644
--- a/src/main/java/com/thebrokenrail/sorcerycraft/client/block/CastingTableScreen.java
+++ b/src/main/java/com/thebrokenrail/sorcerycraft/client/block/CastingTableScreen.java
@@ -67,7 +67,6 @@ public class CastingTableScreen extends ScreenWithHandler<CastingTableScreenHand
             if (button.visible) {
                 Spell spell = handler.getRecipes()[button.getIndex() + indexStartOffset];
                 button.setMessage(SpellTag.getTranslatedSpell(spell.getID(), spell.getLevel(), true).getString());
-                button.setFocused((button.getIndex() + indexStartOffset) == selectedIndex);
             }
         }
     }
@@ -78,17 +77,11 @@ public class CastingTableScreen extends ScreenWithHandler<CastingTableScreenHand
         client.getTextureManager().bindTexture(TEXTURE);
         int i = (width - backgroundWidth) / 2;
         int j = (height - backgroundHeight) / 2;
-        int k = spells.length + 1 - 7;
+        int k = spells.length - 7;
 
         if (k > 1) {
-            int l = 139 - (27 + (k - 1) * 139 / k);
-            int m = 1 + l / k + 139 / k;
-            int o = Math.min(113, indexStartOffset * m);
-            if (this.indexStartOffset == k - 1) {
-                o = 113;
-            }
-
-            blit(i + 94, j + 18 + o, getZOffset(), 0.0F, 199.0F, 6, 27, 256, 512);
+            int modifier = (int) (((float) indexStartOffset / k) * (1 + 139 - 27));
+            blit(i + 94, j + 18 + modifier, getZOffset(), 0.0F, 199.0F, 6, 27, 256, 512);
         } else {
             blit(i + 94, j + 18, getZOffset(), 6.0F, 199.0F, 6, 27, 256, 512);
         }
@@ -104,10 +97,10 @@ public class CastingTableScreen extends ScreenWithHandler<CastingTableScreenHand
             if (!canScroll(spells.length) || (x >= indexStartOffset && x < 7 + indexStartOffset)) {
                 ItemStack itemStack = spells[x].getItemCost();
                 itemRenderer.zOffset = 100.0F;
-                int n = k + 2;
+                int y = k + 2;
 
-                itemRenderer.renderGuiItem(itemStack, i + 5 + 68, n);
-                itemRenderer.renderGuiItemOverlay(textRenderer, itemStack, i + 5 + 68, n);
+                itemRenderer.renderGuiItem(itemStack, i + 5 + 68, y);
+                itemRenderer.renderGuiItemOverlay(textRenderer, itemStack, i + 5 + 68, y);
                 itemRenderer.zOffset = 0.0F;
                 k += 20;
             }
@@ -211,8 +204,9 @@ public class CastingTableScreen extends ScreenWithHandler<CastingTableScreenHand
         }
 
         @Override
-        public void setFocused(boolean state) {
-            super.setFocused(state);
+        public void render(int mouseX, int mouseY, float delta) {
+            active = (index + CastingTableScreen.this.indexStartOffset) != CastingTableScreen.this.selectedIndex;
+            super.render(mouseX, mouseY, delta);
         }
 
         public int getIndex() {