Update styling
Refactor spacing logic to remove duplicate code