Revert "popupp menu branch"

This reverts commit a5b5427dff8f85376849ffc7ee7a92ed90a3443f.