changed button text
changed logo link to point to PN home
merged conflicted file