Added colors, did some front-end refactoring
Merge branch 'feature/colors' into develop