Updating the input fields to make them more little and add a TODO