Layout was improver