GUI: Some cleanups