Apply ui change and fix bug