Update buttons to include skip button, drop calendar.
Merge branch 'gh-pages-dev' into gh-pages