Redesign layout and aesthetics