Merge in page.rb changes