Everything should now be converted to the grid layout