Minor layout fixes and enable user name update