fixed margin and border issues