Re: Improve and unify tables according to new design