various layout updates