Merge pull request #77 from SGover/AdeelTariq-alpha

Gui updates
Merge pull request #79 from SGover/AdeelTariq-alpha

gui
Merge pull request #80 from SGover/master

merge