Added new graphics fixed up some behaviour