layout : improvements