Added sidebar styles
Add styles for grid and view
Merge remote-tracking branch 'upstream/sass' into sass