Small layout fixes + move checkboxes outside notebook