Misc toolbar changes