gui messsed the design, refactor is needed but this commit fixes #7