Improve form labels.
closes #96