Additional work on the GUI done