[PATCH 0/6] Improve and unify tables according to new design