Added/updated templates
Rewrote with generic views, modified urls to match