fixed some of the layout + login and logout
Merge branch 'mandrill' into dev