Tidy up layout a bit, tidy up input a bit