some polishing on icons and geo tracking