Fixed sidebar styles
Merge branch 'feature/sidebar' into development