Added client-side top nav handling