Add modal navigation and change sidetag behavior