formatted login pages
Merge branch 'development' into john-dev