Labels added to forms, closes #9