Update with new layout and tagging