Navigation tools and more work on html templates