Changes to User input and GUI