Improve the spacing on larger font sizes
Merge branch 'master' into tourapp