Re-scale order for charts and unify list dialog