Fixed some tabbing problems