improve user flow, and detach audit template, replicate this changes into all other entities
improves