added all features to modal form