added routing and navigation