Updated Layout and migrated to Ruby 1.9 Style hash parameters