Amend giron lists

Amend button position

Amend lists contents to show user name