Context menu, lots of fixes