tweaks to improve speed on non-gpu-accelerated devices
adding close button
Merge remote-tracking branch 'origin/feature/push-state-2' into staging