Model Page updates

This is still in working progress. Committing to keep upstream up to date.