Fix bug
Performance for GUI