Added buttons, fixed a few stray bugs. Added a settings file.
Merge remote-tracking branch 'origin/master'