[GUI] Minor improvements