Removed grid inner and added layout wrapper