working copy before adding time support
Added timer and time history, polished look a bit.
Fixed shuffle behavior