Added sidebar
Merge branches 'sandra' and 'frontend' into frontend