Helios: Confirm box related improvements