Re-rorganized panel context menu

Removed old code