working on layout update