Adding editCollectionScreen and a few other changes