label the solvent faucet with 'water'
adjust layout to match mockups of 'Basics' screen