making page titles more generic
fixed conflicts in merge