few tweaks on service pages