Can we avoid this completely? We don't really need fancy collapsing if the new controller is there to display the values directly, no? :)