Merge pull request #85 from mreist/Jay

Jay
Got rid of Options button
Merge pull request #86 from mreist/master

Got rid of Options