Update due to GUI refactoring