Closes #2: Resubmitting button fixes for new structures.
Merge pull request #6 from mapkyca/button-fixes-resubmit

Closes #2: Resubmitting button fixes for new structures.