Button update

Almost there.
Merge pull request #1 from Kraegon/master

Pull