Merge "Update dependent logic in modes vis page" into main