Fixed event listeners, counter and pushing working version