Fixed quite a bite of rotation and UI problems

Ugly rotation solution, but were going with it