Some restyling. Refactored complete checkbox