Small improvement for UI