Cleaned up toolbar