Layout change fix