Reworking header for case, ditching modals, more unified errors