Revert "Revert "Kiosk update""

This reverts commit 31f3117eb60b76ec4809613e16021178776d80b5.