Remove ReorderHandlers
add Controller
update UI to new controller methods
Executor implementation and test