UserName and Edit icon added.