Tidy up some input stuff and tweak the UI