Removed Coding violations in GUI

Fixed some coding convention violations in GUI
Merge branch 'master' of https://github.com/NAH1/A5