Back button, Location Search modal + other tweaks