Fix views and urls