1. Merge labels into buildings

    Closed
    #169869153 0 3 2 0

  2. Add building levels, improve building shape.

    Closed
    #169861974 4 8 8 0