Added background, refactored some code and deleted some unused view
merging fix