added images and css styles
fixed conflicts