Fixed rspec tests
updated user page
merge