#38 started work on context menu
Context menu added and working correctly