Updated views and urls