Moved nav back, clean up
Fixed logo, started on the jumboform