update lesson detail view and some other stuff
manual merge
additional files left out of merge