Several changes on the GUI