Tweaks to the controller
Merged index.rb