Fix wrong layout inflation method leading to stupid bugs

Should probably be applied to develop
Material queue, using guidelines. Looks weird.