Adding username as a field and modifying UI