Make map clearer, and fix error in main page