Reorganize, and mitigate a chrome padding bug