updated urlconf and views