Redesigned overall UI