[NOT] Spike navigation refactoring

Even though it says it's a spike, the separation of templatey things from navigation things seem nice.