reworked urlconf and views