urls and view minor changes
merged