Design and page minor changes
Teacher pages
Merge branch 'morepages'
Merge commit