140818

New url, moved code in views and tests