[TASK] Unify table layouts