Combat: The player returns to the lobby when combat is completed
UI: Fix for previous commit (511237)