I'm going to leave the manual compute_layout options for now but their going to be disabled by default.