Designing views

Pull request for merging designing_views branch into master.