undone grid rework cause it breaks main page and other things