Consolidated and rearranged the Configuration tab.