rearranging layout to better fit the new username placement
Merge pull request #2331 from awesomerobot/master

rearranging layout to better fit the new username placement