Added table coding and updated spaceing