Various sidebar/toolbar changes