Created UI element for selecting entity types
Cleaned up entity type declaration