pushing current code which still has an issue with the picker modal