Tidied up Sit validations and fixed edit page [#52776423]