Improve doc layout

Change-Id: I6c196e3edbc2ac77abfde56252203895e9a9d3ea