fixed things and added graphics
added graphic template for later use
fixed conflicts