Update overall site layout, navbar and footer
Move contact form to use haml
Some minor view updates