BEM/padding tweaks