various layout change updates