some code sniffer stuff
UI and copy review
Merge branch 'dev' into feature/refactor_comments
Merge branch 'dev' into feature/refactor_comments