"changes in layouts and fixed bug with showing grid