Improvement to layout_cef template