pvr: improving layout
merge new stuff from Black09/master