various tweaks based on comments on phazel's work
Merge pull request #5 from Skud/buttons

various tweaks based on comments on phazel's work