Add flags, add sub-titles, improve consistency in the placing of flags and formatting of their text