Refactor, fix table not show in full.