Add flag-sprite and minor rearrangement