Changed to Ruby 2.1.1
With some jquery and refactoring