More checkboxes on the left and accordians
merged changes