Added touch-hint screen, validate click data
Minor refactoring