Added graphics
Made some minor changes