Fix for <320px
Add user to top
Fix merge conflicts