fizing a few issue with clickings