Added basic sidebar struructure
merged master
merged master