Add scoping to submission contexts
Fix logic for showing the countdown