Cleaned up some margins, animations, and things...