UI change and change a bit in code