Add popup and tab navigation