Moved button management into Toolbar view