Fixed tabs styling and cleaned up