Fixed GUI bugs