Added labels to forms, fixed #24