[cyril] relayout based on new design.