Wow Godfrey --- your progress on WE is amazing! I see that you've figured out templates as well, borrowing ideas from Declan. Fantastic.
I just wanted to point you to two generic templates we have in WE for project navigation and content pages.
You'll find information here about them:
They're relatively new in the Wiki, and are easier to use. Also we're trying to encourage folk to use these templates to promote a consistent look and feel.
Take a look -- perhaps you'd like to replace your navigation templates with one of the new ones :-).