Added to models and cleaned up views
view changes