Cleanup the templates to use first name and float the logout to top-right