Added Code for Map and Weather