Fixing config and CSS bug
Merge remote-tracking branch 'origin/master' into stable