Updated routes
Updated view