WIP: Fix vertical spacing