Fix margin, allow optional text for Tab