Add Sidebar Links
Merge branch 'dev'