Fix some bugs

Most notably, expanding the countdown centers it properly now.
Merge remote-tracking branch 'origin/master' into gh-pages