Redesign: fix new arrangement