Pass original layout arg through find_layout