Remove layout.html and navigation.html and including them in files fixes #1