fianl UI change