Adjust formatting and fix issue when unchecking option.