Removed unused grid inner and class, added layout wrapper