Added contact picker and few other bits