Fix UI bug when showing few fields