Redesign to fixed layout