Small fixes of content form