address #448
Merge pull request #458 from achamely/master

Clean up and address duplicate buttons