Added building models; changed UI