added modal
user page
merged