GRIP layout + small changes