removed form-action bg, some layout color changes
Merge branch 'master' into step4