Final phase of initial UI revamp