Fix it to load proper pages.
(I should test code before pushing it ..)