Validation fixes and some more view fixes