Move Draw creation to retained Fragment