Fixes for picker at varying base font sizes