Flags added and images rearranged