Various GUI etc fixes