Finished Rotation and cleaned up more code

Also UI optimization