Most UI issues addressed