more zombie undelegation, layout change on master view