[Garima] layouts improved