fonts changed and padding added
Merge remote-tracking branch 'origin/B2'
merge remote b2 into master again