optimized backgrounds. added units
Merge branch 'master' into gh-pages