Heading issues, don't draw empty heading