improved some UI experience