Merge branch 'JW'
update classes in layout and login