Several changes on UI