Small refactor of views and urls.