Fixed cursor-to-component dispatcher and begun refactoring demo