Lots of UI additions and frameworking