You can now create more buildings and floors in iCM.
If you create buildings under more than one content root, at the root article IDs to the Buildings array in the configuration. This will automatically make them appear in the Contribute form. You may also need to update your room search article.
Rather than using Lists, the Location template works well, adding the rooms as inlines in the article body text:
