Improve context menus (form elements menu still missing)