style fixes
layout additions proposal