Fix concat's in components directory

This is a code style PR