started to fix GUI