Major overhaul of some classes/views