UI changes, Made checkboxes inline