fix borders and spacing