unify to new layout