changed up views, and models are simpliefied slightly