diff --git a/src/main/java/ebf/tim/entities/EntitySeat.java b/src/main/java/ebf/tim/entities/EntitySeat.java
index 65909843b..da6217c87 100644
--- a/src/main/java/ebf/tim/entities/EntitySeat.java
+++ b/src/main/java/ebf/tim/entities/EntitySeat.java
@@ -6,6 +6,7 @@
 import cpw.mods.fml.relauncher.SideOnly;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.block.Block;
+import net.minecraft.client.Minecraft;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.nbt.NBTTagCompound;
@@ -145,7 +146,7 @@ public void writeSpawnData(ByteBuf buffer) {
     @Override
     public void updateRiderPosition() {
         if (this.getPassenger() != null) {
-            this.getPassenger().setPosition(this.posX, this.posY+(getWorld().isRemote?0.4:-1.5), this.posZ);
+            this.getPassenger().setPosition(this.posX, this.posY+(getWorld().isRemote?(this.getPassenger()==Minecraft.getMinecraft().thePlayer?0.4:-1.3):-1.5), this.posZ);
         }
     }
 
diff --git a/src/main/java/ebf/tim/gui/GUIPaintBucket.java b/src/main/java/ebf/tim/gui/GUIPaintBucket.java
index 220cdd548..290c97e13 100644
--- a/src/main/java/ebf/tim/gui/GUIPaintBucket.java
+++ b/src/main/java/ebf/tim/gui/GUIPaintBucket.java
@@ -104,7 +104,7 @@ public void drawScreen(int parWidth, int parHeight, float p_73863_3_) {
     public boolean doesGuiPauseGame() {return true;}
 
 
-/** adds the correct buttons based on which case happens*/
+    /** adds the correct buttons based on which case happens*/
     public void defineButtons(){
         switch (guiScreen){
             case 0:{
@@ -127,7 +127,7 @@ public void onClick() {
                 );
 
                 buttonList.add(
-                        new GUIButton( percentLeft(75)-10,percentTop(56), 20,20,">>") {
+                        new GUIButton( percentLeft(75)-7,percentTop(56), 20,20,">>") {
                             @Override
                             public String getHoverText() {
                                 return "Next Page";
@@ -169,7 +169,7 @@ public void onClick() {
 
 
                 buttonList.add(
-                        new GUIButton( percentLeft(75)-16,percentTop(45), 64,20, "Close") {
+                        new GUIButton( percentLeft(75)-7,percentTop(45), 64,20, "Close") {
                             @Override
                             public String getHoverText() {
                                 return "Close Menu";
@@ -184,7 +184,7 @@ public void onClick() {
                         }
                 );
                 buttonList.add(
-                        new GUIButton(percentLeft(83) - 61, percentTop(56), 40, 20, "Random") {
+                        new GUIButton(percentLeft(75)-7, percentTop(34), 40, 20, "Random") {
                             @Override
                             public String getHoverText() {
                                 return "Randomize Skin";