Fixed the toolbar to always refresh properly.