Fixups around the place and use set_move_on_ui_board function