Simplified context menus, added support for submenus