Fixed GUI Issues