Using angled labels

Change-Id: Ia98fc287229a5f95939da78a2903a3493f5992ef