Added login/logout and base template