layout update, work on UI