epgp view fixes