Tidied up content editing forms