Header and page name changes

Big changes based on feedback from the client. Also some rearranging
has been done of the links and page names.