Update main + layout