Fixed missing onClick methods