More refeactor to clean up routing. detail page routing still not working