small design adjustments and language