refactored names & implemented kiosk screen