Move std decorators out of layout factory