-Re-ordered handlers in a consistent fashion in deal.lisp and deal-ui.lisp