refactored router
working user profiles
fix conflict