fixing page and index - at last :)