Clean up toolbar styles a bit more