Added icons and address search