Updated views and routes