[UPDATE] Redesign layout