Slight GUI cleanup. Condensed a query in the cache.