Tidy up ui and start adding the msg