layout stuff and classes page
Merge remote-tracking branch 'origin/master'
fixed classes page app bar