Fixed some bugs
Fixed table drawing
Fixed drawing