style changes
added background images
fixed merge conflicts