Added data picker and other bug fixes