Fix up padding in layout