UI change and udate