Context Menus and additional options. DB changes