Adds ES and new UI improvements