GUI cleanup, refactoring, prepared place of progress info and peak
detection