finished adjusting the new toolbar so that it shows up at appropriate times