More padding fixes for layouts.