added user profile and modal
fixed conflicts