Implemented field validation in model
Removed unnecessary fields from views