Changed the side bar issue.
Merge branch 'Sidebar'