Removed redundant entities from Model, and fixed property names in UI to reflect that
Removed some redundant code