Fixed checkstyles in some ui files.
Merge alex/dev