First pass of Content update
Some more tweaks to Content