Hopefully fixed ToolbarView