Updated user_id to supervisor_id, merged with dashboard