Preliminary work on the new user interface

Please note, this commit will break views.