Checkbox fixes
Merge branch 'flat-ui'
Merge branch 'master' of https://github.com/Gowiem/Sisyphus