Table header align fixes #40
Also changed address tracking from index2