maked dynamic form better