Checkbox layout, refactoring