Edit on Add/Edit Building + other minor fix