Stole bay's new viro layout, fixes remaining viro issues.