Fixed the non-working form elements. Closes #41