updated sidebar but css playing up
Merge branch 'sidebar'