remove code, fixed edge case, and button display
Merge branch 'master' of https://github.com/timothyswt/SWEDUPHX