master: 91b589ab28502690ca90c7218a9e3bf15dd8500f Sorting out the index and page structure