Redesign of the index
server fixes