Router tweaks

Plus improvements to landing page setup