Improved structure view.