More itty-bitty layout fixes