Revert 051169c..2bae2ed

This rolls back to commit 051169c5575acc0117946c245add1a84c3352d8b.
Revert "Revert 051169c..2bae2ed"

This reverts commit 294e9fe61c4a18c047e3f797f4ae1cf810d4cfd8.
finished the drop-down menu