Final commit before refactoring of user input screen