Scan page fixes and a better photo upload

The Add and Remove switch on the scan page works again, and Search is hidden for now. Phones get a round account button at the top right. Upload takes many photos at once: say whether they are one bottle or several, pick a location, and it uploads in the background. iPhone uploads are more reliable, and the location button now reads Select scanning location.