Fixes to adding page content now that there is only a single component type