Fix make list update
Fix modify layout