Fixed rendering bug on edit report, improved flow of fields