adding sidebar subview
merge from master