Don't rely on hardcoded positions for the menu items
Added Disconnect option in the menu