Minor changes with clicking