Major overhaul of the interface