Cleaned up the Vertical Header logic