Corrected content order on forms and non-live message