Smaller improvements of gui