added button logic & usernames