CMS Upgrade from 4.0.2 no Pagination, Change layout for list.php / vbcms_content_list
 

I upgraded to 4.0.2 and enabled the Pagination links for a section in my CMS, but I still only see the View All link. I am assuming some templates were not updated. So I checked my default vBulletin install and saw the vbcms_content_section_page did not have the $pagenav code. SO I just copied and pasted the entire vbcms_content_section_page template code from the default vBulletin install and now nothing appears, no View All or Pagination. There is likely another template that needs to be updated for Pagination to work in my CMS but I cannot seem to find where it would be. Help in getting Pagination working would be good.

The second issue is using a different layout for articles retrieved from list.php.
For instance, when you click a date in the CMS Calendar Widget it fetches a url like 'list.php?day/1234567890'.
This is displayed with my custom Home layout. Doing the same action from a different section that has a different layout yields the same result- displaying 'list.php?day/1234567890' using the Home layout. I do not want this to happen. I want to use a different layout for list items. Basically the home layout is only for the Front / Home page.

Thanks for any help that can be dished out on these problems.