layout changes fixed