Merge pull request #39 from SecondGenDesign/master

Update Tristan buttons
Edit Form fixes
Merge pull request #41 from SecondGenDesign/Tristan

Edit Form