Few color and margin bugs (adapting purple)
Merge branch 'newdesign' of redmine.wi1projects.com:dlr into newdesign