Adapting Critics and Similar to new UI