Add logo, add locate button, fix overwriting previous location