modify and fix part of rspec
Refactor the view and javascript.
Merge remote-tracking branch 'upstream/master'