Added table layouts