GuiMain Commit: Refactored & QA with sapces to java coding standards