Completed re-implementation of UI.