Few minor changes in all kiosk classes