Fixed some GUI bugs