Clean Up!

Cleaned up some of the animations and button positions, and made syntax
readable.