fixed layout and login view locations
Merge branch 'ben-dev'