tweak texts and layouts
overhaul ++