Fixed Modal bugs