Minor bugs fixed and code cleanup
Just hide the edit button when the edit form is visible
Merge pull request #1 from jbbarth/vincent

Minor bugs fixed and code cleanup