Rework the menu spacing