Closes #70 Several bug fixes in the admin form