Revert "up stream updates"

This reverts commit f459de6d050d3a6a0124ab2632dcdac365246177.
Revert "menu reorder and adding"

This reverts commit 8c6926211687bea6294f7a6c791ca5adfc288718.