fix modal issue, bring everything on