Merge pull request #10 from mkeung/master

update bottom shortcuts, faucet content