UI experience improve