change some view and remove some "binding.pry"