Redesign layout ui