Improve doc layout

Change-Id: I823e37821fad10bbc04530cf9ea9d9568d3f9118