consolidated style
layout commit