Do payment (untested). Make landing page prettier.
Merge upstream.