layout change
tweak / cleanup