fix layout changes