Finish form add and edit