Cleaned up toolbar buttons a bit