Updated GUI and messages
Merge pull request #2 from zD12/patch-2

Updated GUI and messages