fixup previous commit
layout tweaks