Tidying up some more pages to continue to fix #2

Also cleaning up primary CSS file