Even more fixes for vertical spacing