Further fixes on modal styles for F5 upgrade, refs T174