More GUI separation and cleanup