update classes in layout and login
Merge branch JW