small modal changes
merged