Finally fixed the toolbar bug!!!