Begin to redesign UI