Add private marks layout unit test
Refactor layout
Don't warn user to login on the login page