Fixed table drawing in main screen
Fixed table drawing in main screen
Merge