Some readability issues fixed in modal