Fixed uneven spacing in header
Merge branch 'dev' into beta