updates to routing and view, still needs work