Padding and logo fixes