Fixed some starburst issues with matching and layout.