click logic undone by long click

+ code improvements