Increase padding on generalbox class to a sensible value
Merge branch 'master_BFC' into master_tab