Many changes
PLaceholder for login.html
Merge