grid layout improvements