fixes to the form structure and usernames shown