Fix dumb menus

- Make context menu smarter
- Small cleanups