Merging templates in
Removing some fluff
Sorting out url routing
Moving stuff around
Lots of fixes and styling for mobile