Tidied up the graphics