Various fixes and repositions from Pail
Merge branch 'master' of github.com:robertmeta/league-timers