Fix a couple of glitches with cell layout
Allow clients to specify UTIs they'd like to allow the user to select