merge with master
pre server deployment
renamed variables
renamed variables in dashboard
wrapped modal with logic
merge with master
Edit listing view