updated map and layout improvment