updated map and tabs