refactor code. remove unused styles and fix field labels with colon