Correct clicking/highlighting