Get rid of input-append
Tidy up corners