Fix navigation between pages