Add new URL, moved code in views and tests