added context menu
merged with master (fixed strings)