just ported over the last of the old menu items to the new top/sub tab structure