Simplify code
Update Kiosk Code to support Open In...
simplify code