Also in this commit, unrelated updates to the building panel (so git sees the markup "just" move in my next commit)