changed some backgrounds
Merge branch 'ui' into demo