First phase with the GUI and couple fixes in the backend