More work on category list and page layouts