Fix spacing
New background, font-weights and borders