Redid main toolbar