Changed toolbar behavior