fix modals and stuff