Make some UI improvement