Optimize the rendersettings view (chosen, mandatory fields and new css classes)
Add whitespace for inline divs
Merge remote-tracking branch 'refs/remotes/origin/master'