Added sidebar and toolbar preference views
Merge remote-tracking branch 'ba/master'