Fix borders and padding