Removed stackpanels that held other grid/list child elements from Xaml