Clean up the buttons
More cleanup
Merge pull request #1116 from MahApps/demo-cleanup

Demo cleanup