Navigation between pages pretty much finished...

... for now at least.