some gui cleanups