Also better organise the 'tips and tricks' section.

Change-Id: If20a89ae93b64b5a1b5895bb9dc73c4e70adaba7
Related-Bug: #1862649