fixing map so it shows to 100% when no checkins
fixing alignment on search icons in timeline
resolved conflicts