More tweaks
Add context menu