Fix Model class for Properties adder/remover
Fix Form Types