made components a bit more standard