UI Changes

Removed content types and added fields to the entity types