Changing background back
minor fixes
Merge branch 'master' into project-1