Added some building management features and UI elements.
Added some building management features and UI elements. Then merged.