Changed UI and added some info