updated to modals for better design, fix for chargroups