Fixed some GUI warts