Side bar implemented.
Merge branch 'sidebar' into development