renamed variables
renamed variables in dashboard
wrapped modal with logic