UI code updates for retrurn event