arrange sidebar general layout + updated map shades