Fixes broken css
Merge branch 'master' into aws

Fixes broken css.
Fixes wrong validation keyword
Merge branch 'master' into aws