cosmetic fixes for layout framework