Improvements on the doc layouts and styles