Move controllers to UI