refactored right click menu