replaced upload and get all and added popups