updates to grid and width naming.