Starts making changes to design of template
Updates changes from master
Adds back more links to navigation bar