slight adjustments, more context menus