testing sidebar v2

note sure about this
some more updates, seems to be working OK
merge sidebar into master