style cleanup. two level menu, first try