Hi!
#1 Building pieces can be upgraded in-place but not for the benches.
#2 There could be such option, but I think it would confuse things. We just got use to it.