Fix tabbing and lines