refactor urls
add analytics