update tested to to 4.1, remove incorrect references to "Block" layout