fix some bugs, change instructor navigation