Fixed GUI BUG