Next improvement and fixed problem with moving in time on click.