Parser hotfix + MainWindow Code refactoring