Fix merge issue and indent.
Increase padding and comment out css that was disallowing inline checkboxes.
Move search and action bars around.