fix border and wrapper