changed url style
solved conflicts in views and base html