Android update

Various updates to the android app that I've been meaning to push for ages.  Sorry this is a bit of a cluster.