Combine redundant moveFailed clauses
Combine redundant displayPopup functions and add callback to moveFailed clause
Simplify popup action to be called from scenario fail/complete events