#93 - icon side bar review
#93-minor change
#93 - modifications after merge
Merge remote-tracking branch 'origin/master'