Tidy up and change design