Header & graph margin adjustments
Merge branch 'labels'