Removed the timer & inverted short/long press