Fix spacing & borders