significant improvements - UI, controller, etc