refactored Routing Component