Modified general layout, map functionality and search screen