Finally nailed the documentation layout