Partially converted category page to use new layout. More to do.