Merge "Change view type for better a11y"