Re: Some gui cleanups