+ reorder / regroup other options based on basic vs. advanced + logging Change-Id: I1cedef08e29f516952671f9e64771ee108e80867