Improve helper, test, layout
Finish log in/log out