Keep the UI and modal handlers order the same as before the priority changes, these rely on being in a particular order.