Front end fixes
Merge branch 'master' of https://github.com/martinthenext/criticalsyncing