Prepare more buttons
Merge branch 'master' of github.com:Wegi/trickle