Added building locality
Design tweaks