Page screen fixes

cc @calvinfo noticed we don't pass those along.