- cleaned up nested divs in views
- cleaned repetition from locale yamls
- removed obsolete state_collection concern
- fixed factory and all tests to run green

and apply the method to other models affected by the change