and cleaned up toolbar