Adding some UI tables and fix data sync scheme