Organization and lecturer modals modified, almost finished