Cleaned up the toolbar styling and removed some flexbox issues