Added Show/Hide to UserMenu section
Used simple logic to display code - added TODO comments and HACK comments to identify changes that will need to take place at some point