fix margins and border