minor changes to the client and button, see more in testnotes
Merge branch 'cubes' of https://github.com/simonem/dontpanic into cubes