re-styled, fixed duration sorting
Merge branch 'master' into gh-pages