Url prettys in Pages
resolve problems
solved problems
Merge branch 'feature/resolve' into develop