Form addition and removal now works properly