refactored be structure
checkbox style fix