Further changes to accommodate Home & Index pages