Updated Building Site UI

Added in the new Building Site UI, but didn't want to tweak the code
until the new UI was approved.