Swage GUI fixes