Fixed problems with urls
Several changes in views