fix page controller
changes before heroku
fix merge conflicts