Tweaks to preview/countdown display
Merge branch 'master' into squares