rename and relayout