Design and performance improvements.
Merge branch 'master' into 148

Conflicts:
	app/js/cdl.js
	app/js/config.js