Added popup menus
Revert "Added popup menus"

This reverts commit eee136e733fd797b2156422b6c599172ee605102.
Revert "Revert "Added popup menus""

This reverts commit 463b2d85a05bf8024197244c25468379c72eb200.