Henrik Reitan #1.4.1
Refitted maps to work with master page, cleaned up login and user info page.