bugfix and GUI redesign