Finally Cleaned up views

Really great experience!