moving standard components to decorators