Many improvements in the GUI