changes in GUI, refactoring, preparing for auto correctness tests