Singles, make text borders and header spacing consistent