Tidy up code and add better images