Added table numbering
Changed some ids