first batch of updates
updated views and added model validation