Fix label occluding double-spinbox
Merge newest HT