Finishing out the styling of the conference screen
Merge branch 'master' into gh-pages