Clean-up

Cleaned up the CSS, re-organized some elements, and optimized Javascript