Fix broken login on small screens
Merge branch 'dev' into stage
Merge branch 'stage' into master