Map layout and coloring fixed