refactored context menu so more options can be added later

merge context menu changes into master