Merged new ui with new controller.