WIP: Refactor horizontol spacing