added background imgs and other stuff
merging conflicts