Fixed some GUI issues