Merge Anish's and mine work

Familiarize myself with the way the CSS and JavaScript work together, and merge both versions
Test that content updates on server
Fix the wireframe a little