Improvements to layout_cef template