Separate modals and fix error status and sessions