More adjustments to get consistent styling ...