merge public and login page
refactoring templates