move charity admin message back to partial, get rit of hideous error message on edit page and fix fake test of field order on show page