View updated. More elements separated for later content.
Also updated vendors