move edit button; minor fix css style;
minor style of username
Merge with move_edit_button branch and resolve merge conflicts.