Added in padding/some cosmetics