fix table center selector + refractoring