Implemented UI redesign 2.0