Major overhaul of the views