Migrated to new Layout name, moved around block title statements, added better handling when result: false state