Merge pull request #1 from alhetimamoon/gui

refactoring
Added the GUI components