design/flwo tweaks