Fxa update

r? mstriemer for the buy-flow-part-one.png changes we did for FxA
r? kumar for the rest