Add dashboard to instructors
Fix conflicts