Revert "popup menu"

This reverts commit 3dd6d3804137ed96162203a98f5c6ee7956e486b.
Revert "edit quit activity"

This reverts commit 5c276f4649c2638c6304133bc55eac3b9706b744.