Modal window fixes
Modal window fixes