Tidied up graphics - still needs some poish