Added some improvements, simplified JS - timing now in CSS