[BUGFIX] Reorganizes comment form fields