IMG-741 Add caption, if there. Also, fix some form labels