improved layout, added context menus