Started cleaning up gui Control windows, and removed some extra code