Bug fix to GUI