Add logout and tests, adapt layouts
Finish log in/log out