UI and popup after finish comp and grammar update
conflict fix