Fixed table size and modified some table parameters