tweak to prevent close button overlap
tweaks to prevent duplicate binding
Merge remote-tracking branch 'origin/feature/push-state-2' into staging