updated entities and removed content types
Merge pull request #13 from jongagne-opin/master

UI components