Some baseline layout adaptation