Update GUI code due to refactoring