made urls user friendly
Merge branch 'clean-state'