background images added
Fixed the merge conflict, still have our background image showing