Modify UI, fix bug...