fixed rendering and picker