A small improvement for UI