Picture tweaks
PVR menu fix
Merge branch 'staging'