Added option menus and context menus.