Border/margin fix