Starting on the next part of the GUI
Changes applied
Merge branch 'master' of https://github.com/keyaral/SwenProject.git