Fix and Add Context Menu