route redesign
fixes for new routing