Some minor refactoring
Fix link on 404 page.

TODO this 404 text should be internationalised.