Kiosk update

Removed test controller/views associated with language select and put
the code in correct areas.