Reorganized Placement of Factions

Now better set within a 2x2 grid, much more uniform. More space between
factions as well.