almost final version of the GUI - general little modifies