Fixed modals bugs