Add better table layout, standard name for ids