improved

Improved context menu