Allowing for layout_name in frame; code cleanup